In adjust_frame_size don't count minibuffer height twice (Bug#21643)

* src/frame.c (adjust_frame_size): In minibuffer-only windows
don't count minibuffer height twice.  (Bug#21643)

diff --git a/src/frame.c b/src/frame.c
index f1a78fbdbf80f63dc616d7633bad3382ac4d1fa1..77ead082ce2574f7a95098bb46213b8089d8828f 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -396,7 +396,7 @@ adjust_frame_size (struct frame *f, int new_width, int new_height, int inhibit,
   int old_windows_width = WINDOW_PIXEL_WIDTH (r);
   int old_windows_height
     = (WINDOW_PIXEL_HEIGHT (r)
-       + (FRAME_HAS_MINIBUF_P (f)
+       + ((FRAME_HAS_MINIBUF_P (f) && !FRAME_MINIBUF_ONLY_P (f))
          ? WINDOW_PIXEL_HEIGHT (XWINDOW (FRAME_MINIBUF_WINDOW (f)))
          : 0));
   int new_windows_width, new_windows_height;